Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Tue, 8 Jun 2010 22:52:50 +0000 (22:52 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Tue, 8 Jun 2010 22:52:50 +0000 (22:52 +0000)

Trivial merge